| commit | ec6156f9e884ba85c76a9c4683f83f18b3f64afa | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Thu Feb 21 01:03:21 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Feb 21 01:03:21 2013 +0000 |
| tree | c8577b33b265ba09b4aefb86e36aa2093883422d | |
| parent | 487767cfecea57ce15193e99b3b3f22a7521f588 [diff] | |
| parent | ef04a9b7e1dee38f191a8f70be89a1542ccbe367 [diff] |
Merge "Fix the build."
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java index 8b643c0..21bef1c 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
@@ -1398,4 +1398,12 @@ // pass return null; } + + /** + * @hide + */ + @Override + public int getUserId() { + return 0; // not used + } }