OSDN Git Service

resolved conflicts for merge of 8c3cb811 to master
authorDianne Hackborn <hackbod@google.com>
Tue, 23 Apr 2013 17:56:23 +0000 (10:56 -0700)
committerDianne Hackborn <hackbod@google.com>
Tue, 23 Apr 2013 17:56:23 +0000 (10:56 -0700)
commiteadbcd3352fa58c685f83e4128f4a01c904b9c7e
tree70fe6e71d73cc6fdc56d0586ab97a4ef58dfe2ea
parente11d9ed3ecb4a1fa8e3e7408118e1575c7eb9538
parent8c3cb8111a5aff8a3f71942dda3020dbec285e27
resolved conflicts for merge of 8c3cb811 to master

Change-Id: I1cd4186b6b2dcb3d1d7d21c346384dbcc6e6a8df
api/current.txt
core/java/android/os/Build.java